(next-history-element):

Cope if minibuffer-text-before-history is nil.

diff --git a/lisp/simple.el b/lisp/simple.el
index 798a706886e2b566ea0e6bed453ecc4f5fa36e8c..6bb122646b1a0fa10c26d87f3eb4e275c0d76d7b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -723,7 +723,7 @@ If N is negative, find the previous or Nth previous match."
        (cond ((= narg -1)
               (setq elt minibuffer-default))
              ((= narg 0)
-              (setq elt minibuffer-text-before-history)
+              (setq elt (or minibuffer-text-before-history ""))
               (setq minibuffer-text-before-history nil))
              (t (setq elt (nth (1- minibuffer-history-position)
                                (symbol-value minibuffer-history-variable)))))